From 116dced2e425f2e413f304a30a34e0e488af7b89 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Tue, 3 Jun 2008 16:28:28 +0000 Subject: [PATCH] osm: Fix errors when compiling without expat. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3251 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/osm.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gpsbabel/osm.c b/gpsbabel/osm.c index 4900f069d..283d321ee 100644 --- a/gpsbabel/osm.c +++ b/gpsbabel/osm.c @@ -46,21 +46,6 @@ static int node_id; static route_head *rte; static int skip_rte; -#if ! HAVE_LIBEXPAT - -void -osm_rd_init(const char *fname) -{ - fatal(MYNAME ": This build excluded \" MYNAME \" support because expat was not installed.\n"); -} - -void -osm_read(void) -{ -} - -#else - static waypoint *wpt; static int wpt_loaded, rte_loaded; @@ -415,6 +400,22 @@ static osm_icon_mapping_t osm_icon_mappings[] = { { -1, NULL, NULL } }; +#if ! HAVE_LIBEXPAT + +void +osm_rd_init(const char *fname) +{ + fatal(MYNAME ": This build excluded \" MYNAME \" support because expat was not installed.\n"); +} + +void +osm_read(void) +{ +} + +#else + + /*******************************************************************************/ /* READER */ /*-----------------------------------------------------------------------------*/ -- 2.30.2